05ae3ad86c0e01cd4f8244ccf26ac01dc4824321,jbpm-form-modeler-core/jbpm-form-modeler-service/jbpm-form-modeler-form-editor/src/main/java/org/jbpm/formModeler/components/editor/DataHoldersFormFormatter.java,DataHoldersFormFormatter,renderPendingFields,#,167

Before Change



            String fieldName = "";
            int i = 0;
            if (dataFieldHolders != null) {
                for (DataFieldHolder dataFieldHolder : dataFieldHolders) {
                    fieldName = dataFieldHolder.getId();
                    if (fieldName != null && !form.isFieldBinded(dataHolder, fieldName)) {
                        if (i == 0) {//first field
                            setAttribute("id", dataHolder.getUniqeId());
                            setAttribute("type", dataHolder.getTypeCode());
                            setAttribute("renderColor", dataHolder.getRenderColor());

                            if (dataHolder.getUniqeId() != null && dataHolder.getUniqeId().equals(wysiwygFormEditor.getLastDataHolderUsedId())) {
                                setAttribute("open", Boolean.TRUE);
                            } else {
                                setAttribute("open", Boolean.FALSE);
                            }
                            String holderName = "";

                            holderName=dataHolder.getUniqeId();
                            if (holderName.length() > 20) holderName = holderName.substring(0, 19) + "...";

                            setAttribute("showHolderName", holderName);
                            if (!dataHolder.canHaveChildren()){
                                setAttribute("noConfirm", Boolean.TRUE);
                            } else {
                                setAttribute("noConfirm", Boolean.FALSE);
                            }
                            renderFragment("outputBinding");

                        }
                        i++;
                        if (dataHolder.canHaveChildren()){
                            renderAddField(fieldName, dataFieldHolder, holderId);
                        }
                    }

After Change


        for (DataHolder dataHolder : holders) {
            Set<DataFieldHolder> dataFieldHolders = dataHolder.getFieldHolders();

            if (dataFieldHolders != null) {
                if (dataHolder.canHaveChildren()) {
                    setAttribute("id", dataHolder.getUniqeId());
                    setAttribute("type", dataHolder.getTypeCode());
                    setAttribute("renderColor", dataHolder.getRenderColor());

                    if (dataHolder.getUniqeId() != null && dataHolder.getUniqeId().equals(wysiwygFormEditor.getLastDataHolderUsedId())) {
                        setAttribute("open", Boolean.TRUE);
                    } else {
                        setAttribute("open", Boolean.FALSE);
                    }
                    String holderName = "";

                    holderName=dataHolder.getUniqeId();
                    if (holderName.length() > 20) holderName = holderName.substring(0, 19) + "...";

                    setAttribute("showHolderName", holderName);
                    renderFragment("outputBinding");
                }

                for (DataFieldHolder dataFieldHolder : dataFieldHolders) {
                    String fieldName = dataFieldHolder.getId();
                    if (fieldName != null && !form.isFieldBinded(dataHolder, fieldName)) {
                        renderAddField(fieldName, dataFieldHolder, dataHolder);
                    }
                }

                if (dataHolder.canHaveChildren()) {
                    renderFragment("outputEndBinding");
                }
            }